Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Sep 2011 18:08:25 +0000 (11:08 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Sep 2011 18:08:25 +0000 (11:08 -0700)
commit7836d6264b4744c9ac9c982d9328677aa94adc62
tree99e6350caa24773c6a38e585865460113d770049
parent32c46115baa20158d63d95e507e15db26e511878
parentb54208ea6491599e7074390662895b9081f858d4
Merge from trunk.